bitkeeper revision 1.1765 (42c16e51XwZ3-cKPHI29xhO2Hzk_sQ)

Increase size of xen_start_info_union since start_info structure
size is > 512 bytes.
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>

diff --git a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/head.S b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/head.S
index 91036572bc5e917babb6b723ca3a6f091c2b6465..a0ccdbc2d992d48de4c77878c346e21891e0acd9 100644 (file)
--- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/head.S
+++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/head.S
@@ -34,7 +34,7 @@ ENTRY(startup_32)
 
        /* Copy the necessary stuff from xen_start_info structure. */
        mov  $xen_start_info_union,%edi
-       mov  $128,%ecx
+       mov  $512,%ecx
        rep movsl
 
 #ifdef CONFIG_SMP

diff --git a/linux-2.6.11-xen-sparse/include/asm-xen/hypervisor.h b/linux-2.6.11-xen-sparse/include/asm-xen/hypervisor.h
index 449dba974558c7a09395f0a07dea01bbcfb5d1dc..a2929951d2a0a3a4b7e1889e66ba90e9a9396ebe 100644 (file)
--- a/linux-2.6.11-xen-sparse/include/asm-xen/hypervisor.h
+++ b/linux-2.6.11-xen-sparse/include/asm-xen/hypervisor.h
@@ -49,7 +49,7 @@
 union xen_start_info_union
 {
     start_info_t xen_start_info;
-    char padding[512];
+    char padding[2048];
 };
 extern union xen_start_info_union xen_start_info_union;
 #define xen_start_info (xen_start_info_union.xen_start_info)